05. Fix Crashes with Crash Reporting

Fix Crashes with Crash Reporting